from trunk
authorKenichi Handa <handa@m17n.org>
Sat, 27 Feb 2010 07:24:12 +0000 (16:24 +0900)
committerKenichi Handa <handa@m17n.org>
Sat, 27 Feb 2010 07:24:12 +0000 (16:24 +0900)

Trivial merge